From c5494ce30489835d68fb8c8df99f9d21aa97eb5d Mon Sep 17 00:00:00 2001
From: "cl349@firebug.cl.cam.ac.uk" <cl349@firebug.cl.cam.ac.uk>
Date: Thu, 2 Jun 2005 19:54:25 +0000
Subject: [PATCH] bitkeeper revision 1.1642.1.1
 (429f63f1jJ1MDBYeqjO8tWNOxXwFYw)

Fix x86_64 build.
usercopy.c:
  Fix build.
  Sync w/ x86_64 version.
Signed-off-by: Christian Limpach <Christian.Limpach@cl.cam.ac.uk>
---
 xen/arch/x86/x86_32/usercopy.c | 3 ++-
 xen/arch/x86/x86_64/usercopy.c | 3 ++-
 2 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/xen/arch/x86/x86_32/usercopy.c b/xen/arch/x86/x86_32/usercopy.c
index f26d916bab..c05ffd429d 100644
--- a/xen/arch/x86/x86_32/usercopy.c
+++ b/xen/arch/x86/x86_32/usercopy.c
@@ -5,8 +5,9 @@
  * Copyright 1997 Andi Kleen <ak@muc.de>
  * Copyright 1997 Linus Torvalds
  */
+
 #include <xen/config.h>
-#include <xen/mm.h>
+#include <xen/lib.h>
 #include <asm/uaccess.h>
 
 static inline int __movsl_is_ok(unsigned long a1, unsigned long a2, unsigned long n)
diff --git a/xen/arch/x86/x86_64/usercopy.c b/xen/arch/x86/x86_64/usercopy.c
index e96eb94d4d..685cd7b1a3 100644
--- a/xen/arch/x86/x86_64/usercopy.c
+++ b/xen/arch/x86/x86_64/usercopy.c
@@ -6,7 +6,8 @@
  * Copyright 2002 Andi Kleen <ak@suse.de>
  */
 
-#include <xen/string.h>
+#include <xen/config.h>
+#include <xen/lib.h>
 #include <asm/uaccess.h>
 
 /*
-- 
2.30.2